Cleanup

Change-Id: I15027049f096db411896d46400f3e937e4276c0f
Merge remote-tracking branch 'slim/jb4.2' into jb4.2