Merge "URIFD way causes leak in PlaybackActivityMonitor" am: 6f09451001
am: e988a3fd64

Change-Id: I79ee2ca82ae1096a9af5587a46b3b8714bf2e332