Merge d82bf131c35a645d4331c471ce91f1ee0bc66db3 on remote branch

Change-Id: I875a5ef67796a24f31334d9b9f84a5b94a9f168a