Merge "v3 keys use SP800 derivation" into pi-dev
am: 83924aca2c

Change-Id: I4d74a329823a05473089936cb2f6907aeda56013