Merge "Extend atoms with Virtual A/B merge metrics" am: f072c7c354

Change-Id: Ic14c32002b5475383e7500a333fa90b96e0203b8