Fixes a typo, lack of explicit modifier, duplication of ;;

Change-Id: Idf42a1dd7707d258bee379082eb4acb5d35ba8b2
Merge commit '04e92ad9cc6515f054045f65d85663a63dc246bb'