Merge "Add adb shell command to set flags." into tm-dev