[automerger skipped] Merge "Compatibility_matrix: s/current/4/" am: 6d312e23e6
am: 1fdb6477f7 -s ours
am skip reason: change_id I3daf93d750462bf7dcb698a353801bc55a459d45 with SHA1 86eb7fc62b is in history

Change-Id: I5c4e2ea05807f70c55dde40c89dfbef56c01df11