Merge "Fix strict mode violation"