Merge "make CallerInfo as SystemAPI" am: 7e902363a6 am: 3f1055a2ba
am: 610244cd4f

Change-Id: I6a3335b42a072522956e747835737e2af455bf38