Reconcile with jb-dev - do not merge

Change-Id: I5024199169618a15d91232c3232e47f0f2cc8820