All supported versions have it in that context.

Change-Id: Iafff4760ba521ffc9abc4e05dbbc9263ed6fe21a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>