Turns out, the whole context is not needed and then let's not plumb it any further than necessary. Test: Presubmits. Change-Id: I1a25738e5a6ca20dea0d973c2ce435b5e152399b
bf49705608
775f9e37c7