This reverts commit d2290a75. Reason for revert: See b/125791902 Change-Id: I16382c11c41c7df6b11e2a9c860d10ab9eaec812