Revert old matrices back to DR / MR1. am: 48952110c7
am: 102759dba1

Change-Id: I42c48c833465ec177f2141aa71ff53ef4fd9b3b1