Merge "CallingContext doesn't have a name in it." into stage-aosp-master