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

Change-Id: If53a9b48d247106f0f4c2fb70a04418e9105ec36