[automerger skipped] Merge changes from topic "call-quality-and-null" am: e081747c
am: 0b89ae6c -s ours
am skip reason: change_id Ibf7cbce46675a7998963070b776654033e0cc46d with SHA1 b9a98901 is in history
Change-Id: If907bae16921ad0277377486e807fc52359831b6