This reverts commit 2ccf0c8e. BUG: 22422588 BUG: 25067918 Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775