Merge commit 'c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp * commit 'c9b6851af68bdc20c4903b16c344e9f116647219': Throttling framework addins
Merge commit 'c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp * commit 'c9b6851af68bdc20c4903b16c344e9f116647219': Throttling framework addins