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

Change-Id: I48cb9d0af9e4853ebc1f60544e167e14965c2a18