Merge "Abstract SetField functions with Transaction check" am: 8cfbbb826a am: 2d482ee710
am: 5154e8bfb9

Change-Id: Ie4c9b3952d8a9649e4729aa2bdceb5dd8c226915