Merge "Merge "Fix SharedBuffer. Remove aref." into nyc-dev am: 5668b84f99 am: 4541e93d32" into nyc-mr1-dev-plus-aosp