Remove onRegistration from header. am: 176eaf71a3
am: 61d1e97de4

Change-Id: Id898a225ba108ae3f3c4c75e66d993907a815ffc