Reconcile with jb-release

Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da