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

Change-Id: I16278379a955886268268a242d0f3dbb4b9e140d