Reconcile with jb-release

Change-Id: If9e036e4156d80d4990cb53a8f7a259df27fb7ce