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