Merge 8b0868f1df77b9feba1aa8a2b24a003c919d7608 on remote branch

Change-Id: I83e699fc0549cece6aa42b3b427dd876910789bc