Merge "Adjust scan permissions" am: 7c95714c14
am: 53173cbc6b

Change-Id: Iefb439a4cb2af9358325e503a2d6f228b36c96fa