Merge "DO NOT MERGE - Updated some javadocs." into qt-dev
am: 2cccdd6b84

Change-Id: I0fbdf2a3a8aae8fa12424f97bef6bbcebd895a07