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

Change-Id: Ib0f72608343b217a97c46a06a8065e821d7a17c4