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

Change-Id: Iee04c060060928b13985473bc5379fc793f16bdd