Merge "Add support for multiple fill contexts" into oc-dev
am: 41200eac71

Change-Id: I9a66bc2d97efbc19fd0cbfd57dfb13323e3ab31a