Merge "Merge "power: throttle interaction hints" into oc-dev am: 78701217 -s ours am: dd028e7c am: 2adfb7e4" into oc-mr1-dev-plus-aosp