Address review comments (#3515)
Address review comments (#3515)

Somehow I missed these in my previous patch.
aghassemi/flutter,tvolkert/flutter,cbracken/flutter,tvolkert/flutter,Hixie/flutter,Hixie/flutter,cbracken/flutter,cbracken/flutter,cbracken/flutter,Hixie/flutter,aghassemi/flutter,tvolkert/flutter,cbracken/flutter,flutter/flutter,Hixie/flutter,flutter/flutter,Hixie/flutter,Hixie/flutter,flutter/flutter,Hixie/flutter,flutter/flutter,turnidge/flutter,flutter/flutter,flutter/flutter,flutter/flutter,tvolkert/flutter,tvolkert/flutter,tvolkert/flutter,aghassemi/flutter,turnidge/flutter,turnidge/flutter,tvolkert/flutter,Hixie/flutter,cbracken/flutter,cbracken/flutter,flutter/flutter,aghassemi/flutter,cbracken/flutter,tvolkert/flutter,tvolkert/flutter,Hixie/flutter,cbracken/flutter,flutter/flutter,turnidge/flutter,Hixie/flutter,flutter/flutter,tvolkert/flutter,turnidge/flutter,cbracken/flutter