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

Change-Id: If381e7880aa2c0e841b2d0051d758078ae03c151