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