Merge "Don't use fences to implement volatiles" am: ac50d97b1b am: 557ec469f8
am: f1a2248376

Change-Id: If21be9c33163fca6390f7eeca76edcfdec414420