Merge "TIF: Set the surface secure" into nyc-dev
am: 9675f16bba

* commit '9675f16bba6837840038aea92e9db5893cecd33e':
  TIF: Set the surface secure

Change-Id: Iae2496a4b761b7635c49272b0611bec7db4b9040