Reconcile with jb-dev - do not merge

Change-Id: I1aa770a475cb1373ea05201e5780eb50562aca6a