Merge "Changed DPMS and UMS to explicitly start a profile."