Reconcile with jb-release

Change-Id: I61b7e1608f928b9a9ae8c5a1a93996d3812cd744