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

Change-Id: I4e08d5b26514b9b9e7482073623a930bc1fcc830