Squash master to REL1_22

Change-Id: I4da5ab163d4146202ffe0320e963db5dfb9ede10