Replace with system Api. Test: TH Bug: 204830222 Change-Id: If2ef0dbb058c4360f046b1c16fdf467594249b03