Reconcile with jb-release

Change-Id: Ia52def758eb08d6651dc08cf8e30df1168b0cf95