Merge remote-tracking branch 'lts/linux-4.9.y' into v4.9/topic/optee