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

Change-Id: I12f606de0bfcccf8c0bb7733fa3c565daae6ae61