Merge changes Ida17f8e2,I7604d745

* changes:
  internal change
  Bump version codes of v18