Merge "Fix missing observer reply callbacks" into mnc-dr-dev