Merge "Fix context verification for relative dependencies"
am: d25c915835

Change-Id: I414ec05da5ab4716f513d9bdb1e1b9384eeb38fa