format the code for switching to guava PR; add import order to doc.
merged with master