Merge "Fix file_contexts CTS tests" into oc-dev
am: f2a905832a

Change-Id: Id90e12c6f03d351fb9cca9d86c2f4e2980e50c5a