Reconcile with jb-release

Change-Id: I0d94ab9864f2742cd8647643f3acf7cdb4e770c7