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

* commit 'e61fbc929fc3453da00995410ccc0c33b0db49e6':