Change-Id: Iaa5f3b75bf7de9dbf458fa5c452f7312989f4c4f
This includes comments from AndroidManifest.xml. Change-Id: I412d9ecb12bad20a49a683d6b3bea4a0be1235ae