Merge "Remove nativeperms." am: cdb84a375b
am: fbb699d0c4

Change-Id: I14901f2c93382548f49162da40e09b7a02954718