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

* commit '3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
  Add one more field in DecryptHandle to support bug 4126624