Worked around the crash caused by API renaming

Bug: 26885642
Change-Id: I1f1ad76d18444d5f250397ef491e1dd4858f0a1d
7 files changed