Reconcile with jb-release

Change-Id: I75d44aea2008be774afc674fda49c2220583080d