Merge "Use op package name as the calling package while start activities"