Snap for 8564071 from 12223f22cfdb705bcf72b627190ab4111dd43ea0 to mainline-permission-release

Change-Id: I08ab70c7b56597e538131640ab5b97ead6e1c69a