Merge "Discovered a matrix element bug while writing cts unit tests."