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