This reverts commit 380f8fd890.
Reason for revert: remove bug fix on master
Bug: 173838775
Change-Id: I3cbb3e383c52095a10b3e22ea4c586c0c3c8d7a9
This reverts commit 380f8fd890.
Reason for revert: remove bug fix on master
Bug: 173838775
Change-Id: I3cbb3e383c52095a10b3e22ea4c586c0c3c8d7a9