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

Change-Id: I13735e1923b1550c53630bca4ea530368003194f