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

Change-Id: Ib8a1cfd071a409a4ecbe016b4bd509127782879b