Merge changes from topic \'gralloc1\' into nyc-mr1-dev
am: 4e36f6e29b

Change-Id: Iea435085178ff536f9294c59a885687793241d75