db3f34f956
This reverts commit 03c5a46235.
Reason for revert: Fixed tests
Bug: 180016597
Change-Id: I45390f157c6c3a379d686e8802648aa948071b72