Merge 8b0868f1df77b9feba1aa8a2b24a003c919d7608 on remote branch

Change-Id: I1321d360214f314db76587cf35b595378094a64d