Merge 29d7a42b51a8286abdcfd43fe060059df656a8b8 on remote branch

Change-Id: I53a134d3b9a3e2b5264d2315cd8187be4eb7f82d