This reverts commit c045fbe323. Reason for revert: Broke goog/stage-aosp-master Change-Id: Ie07ba02bbad25593a925c01466bb8915d1213a42
c045fbe323