Forms-134 :  add data-attributes to HTML elements to make Forms styling easier
Forms-134 :  add data-attributes to HTML elements to make Forms styling easier

- removed unused variables from choiceexpanded

blinkmobile/forms,blinkmobile/forms