This reverts commit c3380f76. Reason for revert: b/119055885 Change-Id: I47e6dd038d97a9d5a48d36b53f9e75e356a1e409