Merge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev