Merge 3fbde46dcb2168534f0d745a529a3286be19e4c6 on remote branch

Change-Id: I720b9133f375611a95c3099608a4763e3711d83e