Merge "Fixed duplicate constant"
am: d202effe09

Change-Id: I66fbd2c14fd8f0bdff3d6ee00dd57ed88e4c39a4