Merge "Bump Master version codes and name to v23"
am: 4309cdce61

Change-Id: Ifbf6c6fbe3d22a1f3de42c8e94753605d1d3bf73