Bug: 35909567 Bug: 30876804 This reverts commitd84a080e94. Change-Id: Id51edce39967075cffe8fbe3860200cfe3a355ae (cherry picked from commitae4306edba)
Bug: 35909567 Bug: 30876804 This reverts commitd84a080e94. Change-Id: Id51edce39967075cffe8fbe3860200cfe3a355ae (cherry picked from commitae4306edba)