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

Change-Id: I04ed43669a1512724a2408cb3e2b410eda4ca2d5