Merge "Legacy wrapper: Use arbitrary limit on buffer size" into oc-mr1-dev
am: 0f65d6e38a

Change-Id: I08d5eb2a782cb5fc60f6e297282ff179e6098ff0