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

Change-Id: Ibf63280a5eae8460bdc6f5f4f4a5087f1ed2b2b5