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

Change-Id: I54dc743244b9b47138cfe0f577f4c5f686f34128