This reverts commit e0b6a4df83.
Reason for revert: Testing a fix for b/171027242 - this doesn't imply this revert will be needed, or the commit is at fault.
Change-Id: Iaf8e2c075f188df95c68824b71362629c6adabfc
This reverts commit e0b6a4df83.
Reason for revert: Testing a fix for b/171027242 - this doesn't imply this revert will be needed, or the commit is at fault.
Change-Id: Iaf8e2c075f188df95c68824b71362629c6adabfc