Reconcile with jb-release

Change-Id: I5be539a659d1dc2da52b31a7fdabdf53aa3511b1