Merge 7940eec884da986b38f11d91ddd782034f9a1a2d on remote branch

Change-Id: I3c16283927f6bd4f29564c2ef1bb81c871cc3ebc