The code was duplicated in multiple places. Pick-to: 6.5 6.8 6.9 Change-Id: If2ab30b7afbf6d2f99c9fffd999218802b734d5e Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
The code was duplicated in multiple places. Pick-to: 6.5 6.8 6.9 Change-Id: If2ab30b7afbf6d2f99c9fffd999218802b734d5e Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>