Add/Improve some Javadocs; Minor clean-up

Change-Id: Ie09b9936b6c5ece3b6d1398fcda5dfff445a65a3
Merge "Add/Improve some Javadocs; Minor clean-up"