Merge "Fix issue #2420412: API review: DeviceAdmin API changes"