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

Change-Id: I4960cd422e2039fe4451aa750f1b7d8f3ffb04c7