Merge "Adding new GSI public keys" am: c5c3f54806

Change-Id: I31b77a7fdd4a3e411f068bd5c7f07794ea35d985