jb changes

Change-Id: Ia32ded5fd11b174b10331a7731f0f0f461b15e2f