Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1