Merge "Fixed build breakage"