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

Change-Id: Ifb4e8076c9d8bbdc8483649650ebbe5ba3ee42df