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

Change-Id: Ia33808481c24b8a8dc8483f95c4541ffc4cc700f