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

Change-Id: I3a587c589237460122cd2aacaed20c462e303db9