JOP40G: Off to the Future

Change-Id: I2fd9ebba75f2db1f314990c35dc410d710c4a908
Merge "JOP40G: Off to the Future" into jb4.2