Reconcile with jb-release

Change-Id: I5f77cb010e72775392c89e224df30c544bce3dd1