bug 45449 regression: fix diff dependencies

Change-Id: I75e142717c2a1ed160a3173a629f3f2273d8946d
bug 45462: correct nearby dependencies (regression)

add the required dependency.. make nearby work again.

Change-Id: I88076867a14c2b7c9bac40316748eec78da17fb9
Merge "bug 45462: correct nearby dependencies (regression)"
Merge "bug 45449 regression: fix diff dependencies"