Final codefreeze build.4

awesome work guys

goooooo Slim

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