Reconcile with jb-release

Change-Id: I2bd087f75ee99d101e38d0e7b62d0aa701283107