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

Change-Id: Ifad0a3d8fdb63724b04ef80e0327ad5903fb26bd