Merge "Fix generating id in android namespace" am: fb4ecf92af
am: 5a9abc56fa

Change-Id: If3c98829216196f8520034e1040bdc878bc4fd5c