Merge "Freeze current as compatibility_matrix.3.xml." into pi-dev am: c62e860726
am: affd778c87

Change-Id: Id054d899ec130db0d434871474463c36eff6e8d4