am c9ff5102: am 35da9685: Merge "Use the basename of file_contexts from the info dict."

* commit 'c9ff5102ad9258f9189afd3bd15eb58cab186215':
  Use the basename of file_contexts from the info dict.