Merge \\\"trusty: Add nvram-wipe utility.\\\" am: bcd37e67db am: 3134353583
am: 5ca2f226e8

Change-Id: I8f4100405a4f11086f367b7ca7cab1a4c238cd66