Reconcile with jb-release - do not merge

Change-Id: I2d47692562ca20d2e2e356ae569a2dbf1caeef0c