Include redirect/section information in file search results

Change-Id: I51c5ae99ab70a610a64f510b8cc522f0d9025efa
Merge "Include redirect/section information in file search results"