Merge "Make sure we handle the matrix separately for non-invertable matrix" into oc-dev am: 399dba4ab0
am: a5485359c9

Change-Id: I8fffb0894d04b0b72ff95e0b87c9f40f22113568