Reconcile with jb-release - do not merge

Change-Id: I3ea7d0a8c3865290f404bb24b464fcfb7410dd0e