Merge d420007de419920b1f333684a3c0c51fb54b9a53 on remote branch

Change-Id: Id26f230f724f53d1dfa252de3c455e94f94c995d