DO NOT MERGE ANYWHERE Emulator: bump ATV revision to 2 for next preview release am: 7b25e32e18  -s ours
am: 7ee3495230  -s ours

Change-Id: I376767a9bf2973b3874e0dbd35661961e45b300d