Use our own Nicki paraphernalia

Change-Id: Ic3dd57775d1d7db9fd9bce4b9590bf450040bd12