Reconcile with jb-release

Change-Id: If15d22c16a727b5a57edb82572fef50bab8f28a3