Merge changes Id0c23d90,I38ccd39c

* changes:
  Don't use SDK 31 APIs on APEX
  Fix incorrect use of "# introduced=" tag.