Merge "Remove usages of CallerInfo" am: 4a49e0b691
am: 8785bd2f5c

Change-Id: Id5b792c115da29346fadd8e1ae95501dd1d27bb8