Dropped in GMS This reverts commit f48ec19be9.
f48ec19be9
Change-Id: I8f04b6fc0bfa70ee531fa589705a149f68b46288