Do not use deprecated interface

Change-Id: I44f649cb5a93d83e0fe40d2eb848dcc352a273a6
Merge "Do not use deprecated interface"