Merge "Fix: search path is not added when one of its parent is not accessible"...
Merge "Fix: search path is not added when one of its parent is not accessible" am: 1fc432f4 am: ec711489
am: f08313e4
Change-Id: I5ebdb5424fb7aa3f70382f1b695247987bc7145b