Merge bcc1a3f47e980dad3fbeadca09794c393100a253 on remote branch

Change-Id: I338f1bf4edf5ab016e257bd93186296407869ee2