Merge "Follow best practices for Atomic variables" into rvc-dev am: abfb1b0eda am: bb1af287a2 am: 5c1e6f14da am: 68cae462f1

Change-Id: I89739647e5d2322df9619481656d009a425667af