Merge "Post-review fixes from http://ag/12048560"