Fix MySQL incompatibility

Change-Id: If5073598e817e1609f890bf3c046d456b87f2bbe
Merge "Fix MySQL incompatibility"