Merge 57feff00459b11968717741365ab6fb586e52509 on remote branch

Change-Id: I3e2fcc6754c1e454d2fc2b103454bd4047834b02