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

Change-Id: Ieff88bbc396d67d484a217d9497f058ba946f6a1