am f0fd0c64: am e61fbc92: am 9bc8f5bf: am a3b8866c: Merge "Add ability for Partner customization apk to override certain DeviceProfile params" into ub-now-porkchop

* commit 'f0fd0c64a4fa41719585455d1f8420c253444447':