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

Change-Id: I27868cb777a78e08d0c18d051768892026f24598