Merge "Add reachabilityFence, remove ExemptionMechanism.finalize" am: 9a9e22fad4
am: 7940256a91

Change-Id: I6b12657a105f215085e5ba7d76f8669e4c48b1ce