Merge "Adjust scan permissions"
am: 7c95714c14

Change-Id: I80ba1d2b2fe2a68cabd41906343d6ebfd6696624