Merge "Merge "Use new no overlay flag instead app ops" into oc-mr1-dev am: 9cb867d6e3 am: 6adbad6937"