Merge "Compatibility_matrix: s/current/4/"
am: 6d312e23e6

Change-Id: Idbce32a888fab4b8b7f63623eefba96781c7b47f