Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am: e8b07e5bef am: d20ae24fb1
am: fbaf4253ae

Change-Id: I3116c759bc651e2fe4a93c17685d7f458d1d436e