Surround MR uses with #if defined read barrier.
am: b885d8b631

Change-Id: Ie4e4dcd8513c3787ad30e8992b12aa2e7d8039da