Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev