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

Change-Id: Id6d04b7bce76aba66a484537e6938dabe91bf07e