Merge "Remove usages of CallerInfo"
am: 4a49e0b691

Change-Id: I38f0ef939b30780d15f964aa3123f69e4c34be1e