Reconcile with jb-release

Change-Id: I8e514e78efc61e6d7cab247e3c6979a6459bcd55