Reconcile with jb-dev

Change-Id: I759af63dfafa66468b93dc7c4ef7db42d760c4d6