[automerger skipped] DO NOT MERGE Unregister notification listener before creating a new one to avoid am: 71801c6ac1 am: 034b1d414e -s ours
am skip reason: subject contains skip directive

Change-Id: Ifdc4b031e6468dc324f7d913e1db93ff90b24236