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

Change-Id: I80d26378aa4e82aec5a79054ad59f3385ac0e8d0