Merge "Support loading system_ext_property_contexts" am: b0f90aa702 am: f6a54f9817
am: f2db52f99b

Change-Id: Id9f398f23e0ed131aeb10b1ab9b6cfb9d827f787