am b1ed7e19: (-s ours) am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev

* commit 'b1ed7e19837ba60b70e8f98e44f83dcf372552fa':