Merge "Change package of CallerInfo"
am: 4a1ef4a01f

Change-Id: Iffba5dbbcf7f457eb844d5e3b6feedb1bdb7b7a1