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

Change-Id: I47e247992f6084dfbabc898e58b9ade435626f16