tree 4c842f9f0345722a6e2a0515a59f25e37337d801
parent 5e5d4df902b701ab5ea5ef4e520d883824185432
author Avantika-Huawei <avantika.s@huawei.com> 1466528355 +0530
committer Avantika-Huawei <avantika.s@huawei.com> 1466564823 +0000

Cherry picks from 1.6 branch

Change-Id: I596247425802fc759463bcf77ea3c885f3161581