Bug: 142979808 This reverts commit 8e1d1ca3ab. Change-Id: I78b7572bcb384de2984f4d81946aceb03aec6758
8e1d1ca3ab