Merge "CallingContext doesn't have a name in it." into stage-aosp-master am: 4172141b88 am: 9994bc2cb5
am: 41dac28ac6

Change-Id: Icf5a1039bbbda665e190ff3c9c44c27e30809982