Merge "Reduce max keymaster message size to 2K am: a0b9b39647  -s ours am: 0448a9a2c5  -s ours" into oc-mr1-dev