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

Change-Id: I1e2e0ee3d298e765f2210752989d64cb9fdbba7f