Updating tests to as a result of defect grooming.

* Reordering imports.

Change-Id: Ia9303e16758ec6b80506241036f9482533337bcc
Merge "Updating tests to as a result of defect grooming."