Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev