Merge "Update Sample Device Admin" into nyc-dev
am: ddb8d18cc8

* commit 'ddb8d18cc83510aa48843ed7ccc54b1926ff2486':
  Update Sample Device Admin

Change-Id: I85ccbb2c94ee364164502682085dca805de37490