Merge "Enlarge buffer size for direct report testing am: 3c01fef56c am: b0fe06a06b am: 213c36d71d  -s ours" into oc-mr1-dev-plus-aosp