Merge "Update configurations to avoid using ApkInstaller" into oc-dev