Reconcile with jb-release - do not merge

Change-Id: Ie741b7bcdfb6114f2d815af59c084468445ca768