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

* commit 'd55860d990587509f0e9624c44494172f3e24714':
  Fix APIs.