Merge changes I1bfa797e,I0ec7a70e into integration

* changes:
  fix(tree): correct some typos
  fix(rockchip): use semicolon instead of comma