Merge "Adding GSI public keys"
am: ddaf736a88

Change-Id: I096dd2f6e98b1538a224e65b5b29d9d2406bf6c0