Merge "DO NOT MERGE Exit when device info fails." into marshmallow-cts-dev