Merge "Removing feature managed_users." into nyc-mr1-dev
am: 5627f0e235

* commit '5627f0e2354a17aed437c6834e15a80048190cf4':
  Removing feature managed_users.

Change-Id: Ib290b63fcebf65ce9511f1aa63462cedcb03269e