Merge changes from topic "presubmit-am-b5e39839c1434267a07590be6e0b1b91" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Fix NPE 2p: 18179a8762
  Fix NPE