Merge "Track deprecation/replacement of Os methods that depend on Mutable*"