Merge "Speed up structure update before OnFillRequest" into oc-dev
am: 6ab00addb1

Change-Id: Ia109ee243482ca0ac5622ec415ca5bfffba7d8e3