tree 4c5e54dc81601bac8d08c22cb3c7a6e2777daf6f
parent 8b40491bc295dccc185b9be5b3616823fcff1a2e
author Alan Treadway <alantreadway@google.com> 1448551837 +0000
committer Alan Treadway <alantreadway@google.com> 1448902106 +0000

Fix for being able to setup Managed User from system user.

Also move feature flag check to ensure it is used in all cases.

Change-Id: If42787c5bc9ab824449c70f90fb827cf2da7507f