Merge "msm: clock-8960: Vote for cfpb in the active set" into msm-3.0