1.2.1 release

Change-Id: I5615c91411eabef3b99ba634d3514c70deb15c14