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

* commit '41efed0ecc07e1d79ee9112c8f64325fbceab44c':
  Use Surface layer for Surface operation.