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

Change-Id: If8aa9152a643522fc896b7a412d3fafb19043649