[automerger skipped] Merge "Update api name" am: f82f807e03 am: c36a071238 am: 1cb6b91c7f -s ours
am skip reason: Change-Id I8c50678bdfd6de89fb8d56122bfa38bdd5ac5c9d with SHA-1 0ab3283ccf is in history

Change-Id: Ib53b0ef7146211f38013618fa7e6dd71c31770f5