Reconcile with jb-release

Change-Id: I0e65efb4045e70313c50cdd49c4b68d69015b64e