Merge 3e0d5423755b86d31612206962b7727283c8aa51 on remote branch

Change-Id: Iaf42ad45d1538bffdd4b0f2664f50e9a07edd650