Change-Id: Id9cde46b38a74f0f6ee368fdc43aee8ec6082b5f
Original author: raphael Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143693