Reconcile with jb-release

Change-Id: I6374571053f315edf862b3c5da52e9fee3c59ce1