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

* commit '526cf1adfd81becd2e5af8f14dcad9d23d1433b0':

Change-Id: I3d5f313029442467f3b5a2f5a78cbd23caea31da