Merge changes from topic "services_serve_interfaces_test"
am: fb54b74fa0

Change-Id: I9fd31cebbb82333d24d1a7675d817b65988f03db