Clear and restore the calling ID. am: 29ed4a99bf am: 3588b8d44c am: 3f32d12be0
am: 7af07643f3  -s ours

Change-Id: I09464c8037545f80d9a78f5f2e7b5bfc3ce65ea0