Change-Id: Ieffbd3077df9e93ab244a5b2b626c7566b52a5be Fixes: 122146748 Test: atest ManagedServicesTest