Update docblock annotations

Change-Id: I263cc834583b3e81bcf27cef26d4da4542ce7d8f
Merge "Update docblock annotations"