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

Change-Id: I854cd279927c60f7d8a726775788c75ef1b0b6b3