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

Change-Id: Ieae5bc0feb90671fc04db07a644696f90907cea3