Merge changes from topic 'enterprise-client-chain'
am: c71b5dab72

Change-Id: Icfae9ac89759cd4d18f63dd2da17587bb7fdf96d