Merge "Merge "DO NOT MERGE Exit when device info fails." into marshmallow-cts-dev am: 13e7461f80  -s ours" into nougat-cts-dev am: 5415774b62  -s ours am: 9ce097eb17 am: 932bc03353 am: 8a88c36b21 am: 53951afb47 am: 1beac6bf55
am: 9c88823f4e  -s ours

Change-Id: Ia35578855245cdf7bdf4bc2705bfca015118ac3f