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

Change-Id: I289074ccedae90d98b2ec60def74585eec6d9eb8