Further changes to API 18.

Change-Id: I647cd1b59033cc97d18e9229a75aba3981e0f004
1 file changed