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

Change-Id: I259f6627b736f979884d1797734562266e44981f