Merge changes I30b40c48,I7d02c54c,Id68ebd35

* changes:
  Use lambda when appropriate
  Remove redundant type casts
  Fix JavaDoc errors