Reconcile with jb-release

Change-Id: I2b3e50f3304a3e5bd0e23e70b30db6e10d546f1c