Merge "Merge "Add CTS Verifier Test for LE CoC" am: 7e5f6807d7 am: 737809caff" into pi-dev-plus-aosp
am: 5463f7fff0

Change-Id: I10fd58ae0b6dc8d1efea46063d4d22c73718dac8