Merge changes from topic "gsi_util_basics"
am: 7010e5b70f

Change-Id: I244b0ffd92540da209771089b87dc803fda87430