Reconcile with jb-release

Change-Id: I8d1db6d558f2de1084a006bd2d63d2afe3b08318