[automerger skipped] Merge "RESTRICT AUTOMERGE Remove the possibility of an NPE that is being seen in master." into qt-qpr1-dev am: 421f0d367d
am: f2a84a6c76 -s ours
am skip reason: subject contains skip directive

Change-Id: I30a187e340d864f09e653a2fd37e719eea96f9b5