Merge "Add related_bug for bug/1660878"