Merge changes If80df0bc,I4e91b2d7,If3aef820

* changes:
  Apply Java 7 diamond operator.
  Remove a redundant method overload.
  Remove unnecessary parameter that is always true.