350202 Align dependency search control

Change-Id: I7d60de9a056849b2f481ef5b08dcbc1a4dae078e
Signed-off-by: Anton Tanasenko <atg.sleepless@gmail.com>