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: Ie3c778df828575d10e9164922210cc5b05723b45