Merge "Abstract SetField functions with Transaction check" am: 8cfbbb82 am: 2d482ee7 am: 5154e8bf am: 9783adfc Change-Id: Ib5f0ac53457924fe1350b829cd8d44ae2a569aa6