Merge "DO NOT MERGE Exit when device info fails." into marshmallow-cts-dev am: 13e7461f80  -s ours am: 0df21819e5 am: 27fb1e6a10 am: 550004f9a5
am: 7a96a010d4  -s ours

Change-Id: Ie5fd94230569653b2818a26072fb7d49d66749a0