Replaced more trx DIY with startAtomic()

Change-Id: I76662aa438ed8aa294f8ec5973c9a51fd8b7cdbf
Merge "Replaced more trx DIY with startAtomic()"