Reconciled with CM - fixed 28 errors

Change-Id: I2b08eddfe2d491e01d1c2dc49f1e3d700c01027e
Merge remote-tracking branch 'vanir/jb43' into newhotness