Reconcile with jb-release

Change-Id: I08692b2be6cd851d6dcfc1a56113837cb2cc219e