Merge f47d1f2e2b5f749da3113f1fc49a15e7fb794586 on remote branch

Change-Id: I60fe59f14ceefcbab6f3db12248a60ed6f92e027