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

Change-Id: I2cfda60077c57d151fb8599845cd202bbc4e625d