Changed to JWR15J
fixed derp in build id
Merge remote-tracking branch 'upstream/jwr' into sm-jb-mr2