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

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