Merge "Perf: Fix RemoteViews memory leak" into oc-dev am: 4554332475
am: f277953d83

Change-Id: I83dc18991a8e29ea70cb152c850f60f78b66006b