Make setClaim non-experimental

Change-Id: I1c2da996211eefe90677a9e77863b3db757f5e19
Merge "Make setClaim non-experimental"