Merge changes from topic "tether_offload_data_limit" am: c869c9df4c

Original change: undetermined

Change-Id: Ibb464a45669213e1e0918367878f07bc1220ad8d