Fixed Data usage option

Change-Id: I7143b00dbf30cea6a643133c2eb4ed0c3e71e421