Reconcile with jb-release

Change-Id: I43a365794949df0e50d3afd06642d67c33dd2e09