Merge cff436fe594e135e51b79f2cd4c8c5a674b9679a on remote branch

Change-Id: Icd959b496af686fafbc8005edb517cf5a60f019f