Fix some deprecated warnings

Test: local unit tests
Change-Id: I2f9b09fc877f76893a36951bf76361bbb9481308
3 files changed