Merge "RESTRICT AUTOMERGE Remove the possibility of an NPE that is being seen in master." into qt-qpr1-dev
am: 421f0d367d

Change-Id: Icc1b0b6da4a8d5b0fed2ebd6d5f68ef82adf4e1e