Merge changes Ibe09f115,Ib015669e

* changes:
  apilint: Fix API lint issues 2/2
  apilint: Fix API lint issues