Code drop from //branches/cupcake/...@124589
The Android Open Source Project authored
0a84e9ca