Merge c959c0a50e535d4c887e6bb1c6eb079d6943c0f2 on remote branch

Change-Id: I424594c208144f8c4ed0ee152c509df348072f4e