Reconcile with jb-release

Change-Id: I23dd2b4acc6d2ca20756d6d674272a2721843d20