Change to JWR

Change-Id: Idc88769a7c2614ffa7296194512ede1d97c0e877