Add parameter definitions to a few critical methods. Change-Id: I34067574ddff4378377cbd0f1870f36fdba64107