am d0750cb5: Merge "DO NOT MERGE Security fix" into gingerbread

* commit 'd0750cb55f57bf68a65652e9b47178f408198a80':
  DO NOT MERGE Security fix