Merge "Add a null check for visibleFile." into oc-dev
am: 1fb3e56998

Change-Id: I7b6faf56a23a120707b9a611fe5bceb8cff5aef1