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