Bug: 26118154 This reverts commit 0b8f1bfd. (cherry picked from commit 60177824) Change-Id: I783dac75b97a424c2d770e0d69e6f346c915a754