Merge "Adding new GSI public keys" am: c5c3f54806 am: 63f215d4c5 am: 290bb3368a

Change-Id: I9d1e5ba88c5c410f582f48fdc7cc4a4b88a6f4d4