Reconcile with jb-release

Change-Id: Id13d4169318ba77e75b2776ba196fdf997b1f076