This change also gets rid of compiler warnings about "deprecations". Change-Id: Id9b83483c453a81ebac34b684656db05e3599657