Merge changes from topic "presubmit-am-082f69b6e78b4ed2b3d64a2becd00f57" into sc-qpr1-dev

* changes:
  [automerge] Fix NPE 2p: 73d533592a
  Fix NPE