Merge changes from topic "flash_gsi"
am: 81939837df

Change-Id: I5ed9bf48bacada6e7cd6df41a8acdcc63229693d