JWR changes

Change-Id: I503ddfe0077806674ed6ddf6191c7a92fdc53eb7
JWR changes

Change-Id: I503ddfe0077806674ed6ddf6191c7a92fdc53eb7