Merge "Fix NPE in getTargetFileForDisplay" into lmp-mr1-dev
tree: ff10fa6b935f39d7ccb034c47e1000a419dddc06
  1. src/
  2. TestCommon/
  3. tests/