Merge "Temporary fix for memory leak on DumpRunningServiceTimeout." into oc-mr1-dev
am: f2e446abe5

Change-Id: I3ed1b7943492eb358164b4a6ce75d9532c020f26