Reconcile with jb-release

Change-Id: I20961dda95f0a5b0b580b73de5e8b09434eaaa44