Reconcile with jb-release

Change-Id: Ic79723ed73516cae44dc9f6d1f1a1b2cc4f461bc