Reconcile with jb-release

Change-Id: I979a9c3a28cf2b41f42ef66b5555f0efecbef672