Merge "make CallerInfo as SystemAPI"
am: 7e902363a6

Change-Id: I7615196e88b03a733daa895e9ffb7ee3d7a47034