Zero memory used for encryuption keys. am: e2e2d308df
am: fce5bc8f14

Change-Id: I06f4be03107eca78ac98affafb9fb612d65f1a44