Paranoidify Nicki

Change-Id: I3dee52f1d819605e0e12902c73f8918b31449c24
Toolchain

Change-Id: I6d592a5e6977cea14a36e2108edbd79994faf4ea