Update PHPDoc comments

Change-Id: Id20f632762d705ba5e5eb18088f6e9e551b3f42b
Merge "Update PHPDoc comments"