4.2.2 final

Change-Id: I917d23966393cefa001184cb0a3fb516ebb553cf