Merge changes from topic "tether_migrate" am: e8401aff92
am: 4bb02709c5

Change-Id: Ice864e02b2ef9da73f5a69e0668b6856e718988f