update my (=ori) dotfiles

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