Merge "Update Sample Device Admin" into nyc-dev