deactivate tests todo.

Change-Id: I5f03b3ca31675214970b204006445b5cf7486ac5
Performance optimization.

Change-Id: I391dd1bd91f9fd4e97dcb8d94f3373c1cc1daacc