am 35c60c94: Merge "Use Surface layer for Surface operation." into jb-dev

* commit '35c60c944a9350d6240673e157fe06a97fb24180':
  Use Surface layer for Surface operation.