Merge "Logging of setting ro.device_owner property" into nyc-dev