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

* commit '1e502f0b23634f462c63619068dc5bcfa1728cfd':
  Update Sample Device Admin

Change-Id: I7b359f607da152a55a4b9a0db5e1994979e2d64a