Merge changes from topic 'passthrough-service-manager' am: 311f9dd097
am: 3e3b67554f

Change-Id: I62ce8a1b6b97bed8086f38203f35bbfd0334351c