Merge "Fix && used in place of &"