Closes https://github.com/flutter/flutter/issues/3149 Closes https://github.com/flutter/flutter/issues/3148
