Switched from begin/commit to *Atomic methods

* This is just stylistic and cuts down on begin/commit calls in grep

Change-Id: I11011c312c91e158e0cce395eca8022535388b90
Merge "Switched from begin/commit to *Atomic methods"