Merge ccb1567224497b08b76456793ebc65d32b826a16 on remote branch

Change-Id: I3872a1616f7e8daef134ab3a1c6cc1bfb205029c