Merge "Fix error BufferQueue attaching flow."
am: 0ffe45c2ed

Change-Id: I5594453f6689d2b947109f51db4b9cab14b5a59a