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

Change-Id: Iab92b185d16cecaec81c191f62931869a816c8e4