Merge "Adjust visibility rules for migration am: a958b1a811"