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

Change-Id: I1f8f5f1cd8596a6fc0057ce3f0c293703faecd29