Merge d3eecdea17a9d9f8d5f75476f86a2b3f3cad99c2 on remote branch

Change-Id: I03e130262b22c7a20be9a1c52077cb8bb10969aa