4.2.1r2 into the future we go

Change-Id: I97dc9e785fae72811f336daaad121186d9c4b81f