Merge "Update Sample Device Admin" into nyc-dev am: ddb8d18cc8 am: 201cda71a6
am: 327f72b13f

* commit '327f72b13f6e7775413ef7af5bcdae473bffe36f':
  Update Sample Device Admin

Change-Id: I7f26434f4ab1d5c6101625537595a220fc089470