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

Change-Id: Icd0cf68917c213064459ed4c553b6f441439f4d9