
Imports cleanup (to follow HACKING conventions) and rename of a test function for naming consistency. Change-Id: I57742ecb35e078cf72e4edb42dfe79ea40348997
Imports cleanup (to follow HACKING conventions) and rename of a test function for naming consistency. Change-Id: I57742ecb35e078cf72e4edb42dfe79ea40348997