Callog merge

Change-Id: Iaeab4e834c71e06e9894ff0bacfecd8f689e7bce