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