Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5
am: be3f56543e

Change-Id: Icec27b83fa9dc557fe47c1646867ce453d38c76b