Merge \\"Fix framebuffer incomplete errors\\" into nyc-dev am: 4bcf66030d
am: bc640cb016

Change-Id: I06a12037c00ac3053918260abb3d10d02912d438