Test infrastructure improvement and code clean up.

Added instance replacement infrastructure and auto-restore functionality.
Cleauped up test cases.
Fixed copyright year.

bug: 25691379
Change-Id: I7e9b0b121c38c3a2c7375b262e2a121abb9c9a59