Reconcile with jb-release

Change-Id: I8635b7a6595d612464881b0cd51226a8a9611a8b