ID resources were being created in the external 'android' package. Change-Id: I35b5b2bb03bb093ade0c3c5dd1f22bd1269fdc6b
Change-Id: I7f20e4f00cf68c78c578ae620a95de7fa97f0761