am ccd6d0c1: am d55860d9: am 8a435ced: Merge "Fix APIs." into mnc-dev

* commit 'ccd6d0c14decd111e7e12bf9844fa5ff75aa912e':
  Fix APIs.