Change constants from API review feedback

Bug: 17390600
Change-Id: Ie93da8eb6786b7135e8b852804a95f376fcb9d91
2 files changed