Reconcile with jb-release

Change-Id: I1a96178bf84a7d3611149411dad003605bd87562