Merge "Make sure profile owner is system app" into lmp-dev