Merge 5e71ec98bd13d83a4e295e9c4efde53b3ae04b8b on remote branch

Change-Id: I1ee3c55e51f67f0d092d2c2864fcc2377f67ef32