Merge "Detect paths without lunch." into pi-dev
am: 7f0d63d158

Change-Id: Ia2e13d6e8929594f71debd70cc8998ab4e752cdc