update my (=ori) dotfiles

Change-Id: I26085e38d288b06781117c8d8856e81a7d0f8ae7
Merge "update my (=ori) dotfiles" into production