Reconcile with jb-release

Change-Id: Ic18750e72ccec1b5aad558da8959c9c4031b27f8