Merge "Remove favorites when app is uninstalled" into rvc-dev am: 35886c0d47

Change-Id: I604ee7375fe4cce04beaea952db26224c3069304