more updates for auto-commit

Change-Id: I99039722c6a2aee10c036ec5617f904b0823e469