Merge changes from topic "am-4c397c3fdf114020970b081e27d88ddf" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-qpr1-dev am: 2529e2db -s ours am: 1beb11d5 -s ours am: 1140d5bb -s ours am: 5a7e9eb7 -s ours
  [automerger skipped] [automerge] Fix NPE 2p: e51c4026 am: 89439d1c -s ours am: de299cab -s ours am: 95d5f3fd -s ours am: ca6a8d29 -s ours