Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 16 May 2013 12:43:46 +0000 (05:43 -0700)]
Change-Id: Ib08d065435ca222a67d96cd9d0f90d98dadd54d4


Trivial merge