Merge "Fix ValueMetricProducer_test on hwasan" into rvc-dev am: 8910bf95 am: 2783274c am: 1beaab13 am: b5cd5657 Change-Id: I1d8a15348951d862a5fa00f56dcd8281a2ad92a0