Merge "Messaging: Fix generating id in android namespace"