Merge "Add missing'}' in javadoc of public API method" am: f50d9fbdc1
am: 054bed5968

Change-Id: I51ad1f6b8d42f4c791c07d41297f02d3e798ccd9