Reconcile with jb-release

Change-Id: I004954e32fede7bc02333dcfa29982117be6bbea