Reconcile with jb-release

Change-Id: I5286d8a2f1d3d992f5c42ed7143d473fad1fdd9b