DO NOT MERGE Migration with latest changes

Bug: 149587783
Test: Association and trusted device still function
Change-Id: I961592562c5231d28a2652c8c08e3908b767413e
8 files changed