Merge "Take over power profile from Lollipop, while keeping new AOSP additions." into FPIIM_WIP