Merge "CDD: "Clarify what are the conditions to be met in order       to be classified as hadware backed and secure hardware"." into nougat-dev
diff --git a/7_hardware-compatibility/7_2_input-devices.md b/7_hardware-compatibility/7_2_input-devices.md
index c6ffb72..b50044b 100644
--- a/7_hardware-compatibility/7_2_input-devices.md
+++ b/7_hardware-compatibility/7_2_input-devices.md
@@ -355,7 +355,8 @@
 remote or can be a software-based remote that is accessible from a mobile phone
 or tablet. The remote control MUST meet the requirements defined below.
 
-*   **Search affordance**. Device implementations MUST fire KEYCODE_SEARCH when
-the user invokes voice search either on the physical or software-based remote.
+*   **Search affordance**. Device implementations MUST fire KEYCODE_SEARCH
+(or KEYCODE_ASSIST if the device supports an assistant) when the user
+invokes voice search on either the physical or software-based remote.
 *   **Navigation**. All Android Television remotes MUST include
 [Back, Home, and Select buttons and support for D-pad events](http://developer.android.com/reference/android/view/KeyEvent.html).