Reconcile with jb-dev - do not merge

Change-Id: I279cb59abafe23786bc22470b5aac06cc3d93f2c