Merge changes from topic "services_stub" am: 34e4b2c3ab am: 776b4544fe

Change-Id: I284b912dc36547530a7beeb4ccc441c8270d9131