[automerger] Merge commit 'adb631a793802bebc0587e280fa2b21cfa18dd8e' into cp2 BUG:35267372 BUG:69120821 am: cc9c63c864

Change-Id: I7d2550c3574988a02276054ffb6f2088ff6ec595