Reconcile with jb-release

Change-Id: Id6125c430848f989d6ce0494403114c137a1dfa3