Merge "Support Speck encryption." am: 14da8f607f
am: 1df4cee2d1

Change-Id: I12936d157eac453515e44dba260920be5f414f2e