Merge changes from topic "gsi_util_basics" am: 7010e5b70f
am: e6541af3ba

Change-Id: Ia2a89b3b4c1523e2182a0db99fdbdc5f1429cd2b