Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca am: fd63239621 am: 0be4c0e261
am: 98e02adb75

Change-Id: Iad83b4b701c9a382510b936df94a65911939a919