Merge "Update references in AndroidManifest." into mnc-dev