Merge "Remove non-functional "adb persist"."