sync with func_linux_a12_branch r217435 

resolve confict