Reconcile with jb-release

Change-Id: Ic25a71c0dcde3cda15caaafd93004f477671db24