Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only."
am: 1bb0616c56  -s ours

Change-Id: I281ad8d15f59927185e6beaf209c609f2282ef61