Merge "Security Fix: Race Condition + NPE" into qt-qpr1-dev am: 8a00254d27 am: ba95108b92

Change-Id: I123889193cc12a7ca9110464e1055e56f947a50f