Merge "Emulator: reset revision to 1 for N SDK system images" into nyc-dev am: 7643dcbd15
am: e8a5a9baa2

* commit 'e8a5a9baa2f7e12c198e832aae7089bf663f7d97':
  Emulator: reset revision to 1 for N SDK system images