nanhu: sync with local repo

Change-Id: I096cdfa2aa6f5c39c1bcad026f2fb611fdb57280