Merge db0331b798ec93639700e7f00890b8aa42840ba7 on remote branch

Change-Id: I5424930fd60f4da96e1b20224feb1ca419715aa3