This reverts commit 4e9a922e. Reason for revert: <b/122518436> Change-Id: I3650b2c6c9bdfa69a3034f9ca49e95a9698c3cdd