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

Change-Id: Ia1bfca972941ff181c04ce01a96ec779fe666144