Merge "Fix doc typo. Improve class javadoc..." am: e08f918a6e
am: 26d28ef826

Change-Id: I7db3a33c933142806cbae90423044ccbac061868