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

* changes:
  [automerge] Fix NPE 2p: e51c402650
  Fix NPE