Merge "Annotating context in framework base"