Fix issues encounted when porting Flutter

Change-Id: I14a1b3c59d32c45e5ef5293f4a66d74fa0f4b3f6
4 files changed