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

Change-Id: Ic68cdb30579426ecd6e1f885cede30963a575f03