Merge changes from topic "tether_migrate"
am: c0c88f7a92

Change-Id: I03e43b7a112f91637941e5193bd21b3e714f5dac