Reconcile with jb-release

Change-Id: I9a3cfd820f7cdde583a380d68485da8668032962