Merge 34829f2ab27a65115cda0de2ad6257abd9e84595 on remote branch

Change-Id: I768fffbd4e96af9aa771af8c0ff9f37ae2059863