Port commit 6961862cb6 to api files of level 23.

Change-Id: I41c5a3221a672a529915e2248c780d8b0ad5d1a4
2 files changed