Merge f2a79a9c15a52226285ea122226640ed74e01174 on remote branch

Change-Id: I65a8086f37ec5314cb8fb42ee7a9db6e1c9d5115