Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am: e8b07e5b am: d20ae24f am: fbaf4253 Change-Id: I3116c759bc651e2fe4a93c17685d7f458d1d436e