diff --git a/android/pics-hogp.txt b/android/pics-hogp.txt
index 61abb91..9c78ef4 100644
--- a/android/pics-hogp.txt
+++ b/android/pics-hogp.txt
@@ -248,11 +248,11 @@ TSPC_HOGP_11_13	False (*)	Suspend State (O)
 TSPC_HOGP_11_14	False (*)	Exit Suspend State (C.1)
 TSPC_HOGP_11_15	False (*)	Write HID Control Point characteristic: Suspend
 					command (C.1)
-TSPC_HOGP_11_16	False		Write HID Control Point characteristic: Exit
+TSPC_HOGP_11_16	False (*)	Write HID Control Point characteristic: Exit
 					Suspend command (C.1)
-TSPC_HOGP_11_17	True		Read Protocol Mode characteristic: Get Protocol
+TSPC_HOGP_11_17	False (*)	Read Protocol Mode characteristic: Get Protocol
 					command (O)
-TSPC_HOGP_11_18	True		Write Protocol Mode characteristic: Set Report
+TSPC_HOGP_11_18	False (*)	Write Protocol Mode characteristic: Set Report
 					Protocol Mode command (O)
 TSPC_HOGP_11_19	True		Read Battery Level characteristic (M)
 TSPC_HOGP_11_20	True		Read Battery Level characteristic: Client
diff --git a/android/pts-hogp.txt b/android/pts-hogp.txt
index 3ea5faa..7e78869 100644
--- a/android/pts-hogp.txt
+++ b/android/pts-hogp.txt
@@ -53,14 +53,14 @@ TC_HGRF_BH_BV_14_I	N/A
 TC_HGRF_BH_BV_15_I	N/A
 TC_HGRF_BH_BV_16_I	N/A
 TC_HGRF_BH_BV_17_I	N/A
-TC_HGRF_HH_BV_18_I	INC
+TC_HGRF_HH_BV_18_I	N/A
 TC_HGWF_RH_BV_01_I	INC
 TC_HGWF_RH_BV_02_I	INC
 TC_HGWF_RH_BV_03_I	INC
 TC_HGWF_RH_BV_04_I	INC
 TC_HGWF_RH_BV_05_I	N/A
-TC_HGWF_RH_BV_06_I	INC
-TC_HGWF_RH_BV_07_I	INC
+TC_HGWF_RH_BV_06_I	N/A
+TC_HGWF_RH_BV_07_I	N/A
 TC_HGWF_BH_BV_08_I	N/A
 TC_HGWF_BH_BV_09_I	N/A
 TC_HGWF_BH_BV_10_I	N/A