Merge "TIF: change documentation wording for onSetSurface()" into oc-dev
am: 12c6a04db0

Change-Id: I8c60455d744a2f44175cc913a0266fd6a4cb8995