Merge "Input API review." into gingerbread