Reconcile recents classes with CM (but keep mem bar around)

Change-Id: I101938613c5d54fd9206451c66ad2b8cfc1864d0