Updated to 2.2.2

Change-Id: I190c97e574c2c338e2b0cfd8ed6aa0ec67018ba7