This is a cherry-pick of 9f976e29a0 from honeycomb-mr2. This is still using the old w600 qualifiers but the next CL will cherry-pick the fix for that. Change-Id: I40ab6717575cdfd02d5f7d05409f0355e96f2085
9f976e29a0