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