Merge "Bump version codes and name to v18" am: f2ef0447c0
am: e7556d59e2

Change-Id: I7edadc046573fcafdb2aac32c36db162b2045b2b