Merge "Stop generating ids in android namespace."
am: 912d283478

Change-Id: I5200ca6bf7268003b8f6e395760b37dc5af8700b