Slim 4.2.1 bringup

Change-Id: Ia47d5519b092140203c3e1b9d68d20fc282b0fe5
Merge remote-tracking branch 'upstream/slim' into jb-mr1
Ya