merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Wed, 6 Nov 2013 14:00:54 +0000 (06:00 -0800)]

Trivial merge