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
Change-Id: I333cf8facd448ac3993713bdd315841c7d249a0b