Reconcile with klp-release - do not merge
The Android Open Source Project [Wed, 14 Aug 2013 22:10:34 +0000 (15:10 -0700)]
Change-Id: I8065fe87949562cb2ec90f4e0126730cded42484


Trivial merge