Reconcile with jb-release - do not merge

Change-Id: Ie539da33a9901ca28759cf85c566bdf201191319