Merge commit 'ff38e38d05a39584650c7c37b4b528334529ec0f' into gingerbread-plus-aosp * commit 'ff38e38d05a39584650c7c37b4b528334529ec0f': Undo API patch due to field pulled up to superclass.
Merge commit 'ff38e38d05a39584650c7c37b4b528334529ec0f' into gingerbread-plus-aosp * commit 'ff38e38d05a39584650c7c37b4b528334529ec0f': Undo API patch due to field pulled up to superclass.