NFC: squash 4.2.2 commits + some fixes

cheers

Change-Id: Id991767b429e1dcd97e83d94ff9efaa6514fb635