Merge "[BugFix]: Remove the android property used by GXP debug dump [RESTRICT AUTOMERGE]" into udc-d1-dev