am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

* commit 'de27b519588ed46c0ba601a489c01d26ec31757d':
  DO NOT MERGE - backport of l92a02b31 from master