Merge "Suppress AID log on adb logcat"