* commit '213705e37be670552ff30892b2e60f7b8d279a7e': cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
* commit '213705e37be670552ff30892b2e60f7b8d279a7e': cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final