Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev
am: 1bae4e3e17

Change-Id: I7e0677a20b59ef8449ec2318292cf7afff7c5115