Bug: 35909567 Bug: 30876804 This reverts commit d84a080e. Change-Id: Id51edce39967075cffe8fbe3860200cfe3a355ae (cherry picked from commit ae4306ed)