ums: support UMS on any volume

Change-Id: I43668a5200d30cef953e0d3e9ded2d8cf0cbbd22
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0