[automerger skipped] Adding new GSI public keys am: c6f308b8e4 -s ours
am skip reason: Change-Id I69dd00dbb0046c681758068b8bbea0c08b9e2c91 with SHA-1 3c739746b3 is in history

Change-Id: I89ab75303177514f6bc6cf3022718d7e1fba1904