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

Change-Id: Id7e64d757e8c0110b3cdf4b5b9d5bc9643b3f23a