Reconcile with jb-release

Change-Id: If02a97e5db71339a785db874c40b20905169bd10