Merge changes from topic "tether_offload_data_limit" am: c869c9df4c am: 3182d32da3

Original change: undetermined

Change-Id: Id9ba87f230591ad969d9de4661e180ac1184f5e3