Merge "[AWARE] Move manager tests from service to manager directory" am: 018f6ec16f am: f74733a367 am: cd4be8b7e0
am: 28d58e1c95

Change-Id: Ie6ea910839b577914e56b0718345e45db16ab146