Merge "CloudSearch API: change the method from getSource to getCallerPackageName" into tm-dev