Merge "Address small comments from http://ag/13957078" into sc-dev