Merge cfee3cd6c49333e646bd6c5a75f575ebcd84ec03 on remote branch

Change-Id: I77425e410e3c0838b461dd5dac3e83be22f6c5b4