Change-Id: I9ea35c07a7f9d2e2a42d952101e99528fd68fb6c
Original author: jmtrivi Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144511