[packages] merge r16152 to 8.09