This reverts commit 9e96c57083. Reason for revert: b/127312065 Change-Id: I8e7248efd74f2a4e6b0a491e5afe03568214cd23
9e96c57083