Merge "Fixed duplicate constant" am: d202effe09 am: 4dbf9e2ea2
am: 5c0b07a124

Change-Id: I47c91d172960ad598d496930a4f11460641c1c1b