Merge 692e37d33afc857db7a53d17cea74a13886a5701 on remote branch

Change-Id: Ic5c08d70f233c96905823e0f11b5784e7b461aba