Merge "Adding bug component per http://go/xts-owners-policy"