Merge "Null safe package name in AppOps writeState" into sc-dev