Merge "Disable historical appops" into qt-dev
am: 16128cc7a2

Change-Id: Ic35af3464c0d9c1a9ef57f2b427f0a9fe2942fa3