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

Change-Id: Ie9fc813d105bc1a43564b677bb9a8757f63a59c4