follow-up to API change in I4a577bfd02b37b

BUG: 17182367
BUG: 17185263
Change-Id: Id54ca29c191b9752fa82ffe5a960113b2e97e5c1
3 files changed