Fix the version info to 1.21

Change-Id: I35b365847922a4bfe0bdda4e4d20c025adf22601