am 849bdeca: am 512031da: Further changes to API 18.

* commit '849bdecabeba724dce4860a7e1b6b1b1630aca2b':
  Further changes to API 18.