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

Change-Id: Ie55de96c5ee03234c8ed5fd20964a1cc38c2e00a