Merge "More reachability refinements" am: 8c0a88c725
am: 2a7e61c2cf

Change-Id: I942b00e8b7904df67803cce4ff8b0023b936109f