Merge 247f5f799028605021cf1e758474e0db9773c1c8 on remote branch

Change-Id: I5aa94de97766e0f8a3fb1a885c1c1098271507f9