Reconcile with jb-release

Change-Id: I675714215ef58bfa51270133d8d68baee1a0f38b