Merge "Allow operator/manufacturer setting to use priority" am: aef1a557aa am: 4244d53c3e
am: 0be36ac0d1

Change-Id: I24b4d5ef74540cba4c90a134615eadd82b1c4a62