Merge "msm: board-9615: switch regulators from local to RPM control" into msm-3.0