Merge "Start agent in correct mode for adb k/v restore"