Merge d84a7cd9f889d2f73edec580d219d642caf77755 on remote branch

Change-Id: I2283f244a6fae54dd53e11ca35bec80bd224786e