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

Change-Id: I2e933a55ce3b239ad9a2afee964d288dcbd04a11