Prep for release 1.2.1

Change-Id: I38d97815e32cfacaa8a46e255d3f97c459295ce1