Reconcile with jb-release

Change-Id: I418b20daade08853f9d1870d76bbf129dea8decc