Merge bdc3fb4b91f20f0c121304c0eb4dcd674decd049 on remote branch

Change-Id: Iad67df0e400baf0bfc92648d66b08a7c55e11d00