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

Change-Id: I2850cbafd7800284d259e04e2889af68d3272ab5