Reconcile with jb-release

Change-Id: Id011e3aaae44e404d9e7b75e5a52f097d2317126