Reconcile with jb-release

Change-Id: Ibbea3fea4ef24b191309ae45a060b4190f1786ca