Merge "clear caller identify before sending system update notification" into mnc-dev