Bump to 2.2.1

Change-Id: I8d4694fdf8c9d251b9f39b2f160c833a9ab031ef