Reconcile with jb-release

Change-Id: I21c043309ed7e243517414afab8a939bd2c3e614