Merge "Clean up duplicated uses-permission" am: 2bfe37de04
am: ed63903250

Change-Id: If252987a1b733844039eadae7590c91c55d1fde2