Reconcile with jb-release

Change-Id: If9696d3922f8b651aac06935a474654e381287aa