Merge 47fbae3887219cf2fd2962e6f52850f4f37cc68a on remote branch

Change-Id: I206f3827ac09d91e44973849d55ddb9bb68fa1b0