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

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