am 6fc4b1f1: am ea110274: (-s ours) am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms

Merge commit '6fc4b1f1d4718bcd9410078f73e6358b787d76f6' into eclair-mr2-plus-aosp

* commit '6fc4b1f1d4718bcd9410078f73e6358b787d76f6':