Merge rk30 sdk422 change