This reverts commit 50641745. Reason for revert: Looking for +2 from main Android team. Change-Id: Ieae138d8a2acce814d6ddbef2545e319edd216fe