Merge "Check for initialization of mUpdateEngine"