Merge \"Use non-CAS thread flip root visitor.\"
am: d4b7ad7135

Change-Id: I4c560952f5f4ed488d0a849feadf2a2d25e15a2b