Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1