Reconcile with jb-release

Change-Id: I4a99d2d262440ec6b6e1c6eed220a9e7cd2ae518