Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
and apply the patch which is pending merge to upstream Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>