Reconcile with jb-release

Change-Id: Ice7fa76d34e7120514e558cc86fd1b76ae718074