Merge 3d767205767936db8e89c7fa2fcb5927c0d30d1f on remote branch

Change-Id: Ide886532acc5256c0859ad65720bc5264b8ddda2