Merge "Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev am: 7286ecc232 am: 7cc3a167fa am: 2565c24475" into oc-dr1-dev-plus-aosp