Merge "DO NOT MERGE EDI: Add DeviceInfo wrapper class for DeviceInfoActivity" into mnc-dev