Merge "Fix logic in loading dependencies crossing namespace boundaries" am: 2aa10ed1 am: 661a37c3 am: 4c43a884 Change-Id: I0dc3ab7cdb33550b27a3c62938abeaf53dd6cc62