Merge "Add trigger for mos-child-upgrade"