Merge "Grant additional permissions for ASAN builds" am: 63211f8da2
am: 1c05f80071

Change-Id: Icb9150c5828272df8ccfce8a4145df2f3c987c45