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

Change-Id: Ib5f0ac53457924fe1350b829cd8d44ae2a569aa6