Reconcile with jb-release

Change-Id: I4deb64bb027bc5216883f21f97502ae54c97fd39