merge 3.0.31

remove ion for wfdhdcp
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>