Merge "Lower-level user enumeration; fix disabled bug." into oc-dev
am: 713b7c6b53

Change-Id: Ic2edcfc0d30bc5429753c313d31703802e630851