Reconcile with jb-release

Change-Id: I9597b2581342c91f69bbabec6cda064dd3c8275e