Reconcile with jb-release - do not merge

Change-Id: I34fdfc427ea0fd0dc887303e7c019226a665f4de