Merge "emulator: get emulator booting am: d665b020f2 am: 0f4de2f8aa" into oc-dr1-dev-plus-aosp
am: 5fdfd05e04

Change-Id: I3be04038a5b06171b95c18c699bf9005056e2506