Merge changes from topic "AlwaysKeepAppOpsSynced" into qt-dev
am: bf5506b240

Change-Id: I4c5b33b9194cf1ce5364619941b1a798a6b4fcba