Merge c304f6366a537f2e05a6edbff15621344fe4126a on remote branch

Change-Id: I777ab0ed2f8fed46e023c7fa94077c80e3ad9803