Reconcile with jb-release - do not merge

Change-Id: Ie81134aa556b0deb90dcba3d914d58558f3600a9