4.2.2 updates & cleanup

Change-Id: I4b0010fbba471391b0a96f9c10bd08be1c8cd8be