am 512031da: Further changes to API 18.

* commit '512031da67147e040f2da31cf30877d09898e311':
  Further changes to API 18.