Merge 2469308802934402ba3106d1f1baed3d67acad84 on remote branch

Change-Id: I251cf173d33388b89253d2371869f9a040c3c98b