Change-Id: If354846b04fb48974cd0345f3a317e52b046014f
Add surface tests Optimize some codes Change-Id: I1691b81d597bfd722d561778f919ebf8ca530e89