Update deprecated code

Change-Id: I1b128b0f8b654c5c76464c12145d927ec10da26e
33 files changed