[automerger skipped] Merge "Remove usages of CallerInfo" am: 4a49e0b691 am: 8785bd2f5c
am: b26a21d371 -s ours
am skip reason: change_id Id8a9f5821ddfcb6b34e2a85c615ba9a283e6e70f with SHA1 0587e3fe7b is in history

Change-Id: I82a9b4d80a12395d656ab3851d0dd91a14fff52a