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

Change-Id: I042ede72db8297cd72de87a8b7d1d1a30c7846ec