Merge "Merge "Fix adb shell cmd activity get-config --proto --device fail" am: c0dd0d6648 am: bb5384dbd0 am: f604b8b688"