Merge "Fix typo that is triggering lint error in gerrit"