sync with the latest code of func_linux_a12_branch

func_linux_a12_branch  r217435