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

Change-Id: Iebebb843f0857cad4ace13731d1f066ab84eabb6