Merge "Fix error BufferQueue attaching flow." into oc-dev am: 4052245c53
am: 5f44bd7228

Change-Id: Ica833c281516f1e27c686f00d7108f5ff8e7dd2e