Reconcile with jb-release

Change-Id: I8a27e182b289fe193ffad6427aeed2db6b120201