Reconcile with jb-release

Change-Id: I7c52b8e82465f28b32e8ebf6df56c258458f2cd3