Renaming id to prevent collision.

Bug: 21878123
Change-Id: If4313d217967310ede7ed3fe11bdbe49311e1a4f
2 files changed