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

Change-Id: Id24865a9e30e27970be4fb3e0d0cd7cf1a7eab4d