use master 4.2.2

Change-Id: I4762f24445b908719c8f55645f7c7963bc0e9fa6