Merge "[automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours am: 54c839515b -s ours am: 1d3ca59a19 -s ours"