Reconcile with jb-dev - do not merge

Change-Id: Ib87793fb3dc051968e2e1683476b217f7118712a