Reconcile with jb-release

Change-Id: Id0b365ef6729dc36b88193f1675d3819e56bd426