Test commit.
Reverted commit.
Replaced Guava collection build() with of() + fixed compilation errors.