Merge "Adding GSI public keys" am: ddaf736a88
am: aea89ed3ea

Change-Id: I3736607f4d8e4239475f792f81cee161258eb9eb