Reconcile with jb-release

Change-Id: I6f6cabff925336ddccc4af80658712c63401e123