Merge 7a261c3542fdf01cf374b745429d9a592b203349 on remote branch

Change-Id: I68a27c3a39e556cad53c6f3b631f099e2b8be38e