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