Merge 5dfd9fe557bb9513abaf70e24ada72b094364a72 on remote branch

Change-Id: I82bee8f4182e5e656b2815c42152ce7f707d004c