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

Change-Id: I1e3da29514943c1e7476db8bc6a1cbba46b7a116