Merge "Make sure surface control is really valid before giving it to client"...
Merge "Make sure surface control is really valid before giving it to client" into nyc-mr1-dev am: f9f8e820 am: ac2c6b30
am: 36fc533f
Change-Id: I2c9664a8c9fce4bc96ed40cdee0b429434250bb4