Merge "Settings: Add a javadoc note for WIFI_MIGRATION_COMPLETED" into rvc-dev am: 198e8c36 am: 0ec9c360 Change-Id: Icdc866576b0e34046e554095efeb2f37e369b374