Merge changes from topic "services_serve_interfaces_test" am: fb54b74fa0
am: 265a39e990

Change-Id: Ia6e2c7b69b05e51b9266affae68e83daaa66ebf1