Bug:2160782 Change-Id: I0a17a9603b53a46a3a434f29bcd72208af1a745b
Original author: ddougherty Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147236