Merge "Add comment to AndroidManifest" into sc-dev