Merge "Add Minimal GSI (MGSI) products" am: aeeb95f99d
am: e3b110532d

Change-Id: I3b8e8c459992d4f3f86ae11e5c6c753f620cfd6d