Merge "Add ApiModelProperty annotation to authorative models"