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

Change-Id: I2e733e43231d55179ee90765e872425f2e95580b