Last notification thing, I promise

Change-Id: Iaf14ee3657e85beb338348b8fee806604a56061c