Merge "Eliminate hw.keyboards system properties." into ics-mr1