Merge "Fix error BufferQueue attaching flow." am: 0ffe45c2ed am: 4b0e77ab69 am: 77533ce953
am: b8a714968f

Change-Id: I3f545aa62fe4d710bb9e27aadcb329620e1155af