Reconcile with jb-release

Change-Id: I4eaf451a2a61d0fa8fc37a1a045ab02ca4ae0711