Code clean-ups following moving the managed profile under accounts

Bug: 16234745
Change-Id: I7b4799157394a85a27610de7e059c846f77dda02
1 file changed