Merge "Address leftover comments on 923337 and 930217."