Reconcile with jb-release

Change-Id: I0ee3f5ee00ac4af5b9dc6599fc7ee6be13a26756