Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5 am: be3f56543e am: 112acdc043
am: 05fa10519d

Change-Id: I52c6c2af873ddf005bcb4897e677f92b7302b2f5