Reconcile with jb-release

Change-Id: I6a74f5247794a5dddd6fbb75b2edbaba06674ab7