Merge "Remove use of deprecated API from test sample code."