Merge "Massage code to better support Files overlay." into nyc-dev
am: 3855e9c

* commit '3855e9ce494fcbd27291f0ea5872d00daf10d3f2':
  Massage code to better support Files overlay.

Change-Id: I37bceb325f8b507724470dc819e43197142e177f