Merge "Change optional="false" to "true" in compat matrix 7"