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

Change-Id: Ifaead205c3a02ff346512af486e20212d6ffd2b1