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

Change-Id: I0ebc8196a2b8cfbd45cb77b2e3affc2b5e649888