Reconcile with jb-release

Change-Id: Ic4989b359b302c5d72751cdebae3433064770a29