Merge "Update api name" am: f82f807e03 am: c36a071238

Change-Id: I4f69bebb7f926588dd326061d030982d324b9b9b