Merge changes from topic "flash_gsi" am: 81939837df
am: 27de3073db

Change-Id: Ic7c0d82deea0e707c23ec19039dcef81594ec5a1