4.2.2 for public

Change-Id: I038e2e99a2fc1a72dd87bf7facd98071d6d5e3ab