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

Change-Id: I2aa892d7c3e7903c0437feaef2e33d4e368e3219