This reverts commit 25978ac5. Reason for revert: fixing the original bug Bug: 145829442 Change-Id: Ib0a5ca722f3f66b5501df4a478d82eb3625f113d