Reconcile with jb-release

Change-Id: I2135fa879e0f56fcf98bf3f489dae804d51e80b4