Merge "Synchronize mPermissions to void NullPointerException." am: 9e7c6b3865 am: 34662c81ca
am: 06c8a76ae2

Change-Id: Idae552e538a826ee521e544feb0e6d3cf2caad66