Merge changes from topic "services_stub"
am: 34e4b2c3ab

Change-Id: I307121c43394cc6183fead0045702bbbcf3d350c