Reconcile with jb-release

Change-Id: Idc084816f4d709bf71c761151d548c8136085767