Cherry picking because automerger is stuck. Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733 (cherry picked from commitc1b736a0cd) (cherry picked from commit97b3ae1a87)
Cherry picking because automerger is stuck. Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733 (cherry picked from commitc1b736a0cd) (cherry picked from commit97b3ae1a87)