Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev