Merge af314bed93407871eb73112e6613390932bf6c59 on remote branch

Change-Id: I14870f44c048f40109b5bf1a63acd8ce67792ef7