Merge changes from topic "tether_migrate" am: 3c38c89a12
am: 7ee15b3bd9
Change-Id: Ice864e02b2ef9da73f5a69e0668b6856e718988f
This commit is contained in:
3c38c89a12
am: 7ee15b3bd9
Change-Id: Ice864e02b2ef9da73f5a69e0668b6856e718988f