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

Change-Id: Ie80b9054e6433b006e449646d409f01cdd056c1d