Merge changes from topic "tether_migrate"
am: e8401aff92

Change-Id: I03e43b7a112f91637941e5193bd21b3e714f5dac