Merge "Update bug component from Android Systems to memory" into main