Merge 6ffe233a87b85bb4d6ab9f3e31d6ad5b2ce80b8b on remote branch

Change-Id: Ie6490e1d4462f9834860258e1a5895a089de1e2f