Merge "Support Speck encryption." into pi-dev
am: 9d1f78358a

Change-Id: I03f5432bd625484e7d31034fe1a0e02f8a936bbf