DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R6

Change-Id: I66fb0a3f7802542750667cbe1e5c144ce1f94c48
(cherry picked from commit 9c4d5e3459c333af9b149b8e1d52e8e3c15328d3)
2 files changed