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

Change-Id: I51bcb78f4a4c6d4e26721d46f3fbccd4a97d0d4d