Merge "Refactored method to get UIDs." into nyc-dev
am: 3787c6b

* commit '3787c6bb7ec3b78c396ea3252506bbf52d0eb2c1':
  Refactored method to get UIDs.

Change-Id: I2bd4be846e8568fefa519e84b45b39718fddb926
tree: cc7b15b88c0d7fb85578d5c210fa90da10bee697
  1. tests/