Merge "Switch deprecation message to $(warning)"
am: 884af82b27

Change-Id: I3a1c904ee81f938b7ed10282eac8a6c67e081f8c