Bug: http://b/69117476 Test: N/A --- currently empty project Change-Id: Ieefae9a7de3a406e69b3ca35921c86668b59b352 Merged-In: Ieefae9a7de3a406e69b3ca35921c86668b59b352