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