Reconcile with jb-release

Change-Id: I851c314b8ce0aed61f82c52638359b346f2b3787