Merge "Only return internal path when not visible." into pi-dev
am: 2254fe2e04

Change-Id: I7e90be19432f3ac8e0ec9b878f31416dca6c1e4a