Merge "Change handling of offset metric for consumer app"