use consistent method to generate constant value

Change-Id: I32b611661918628c5b8d125ff738069cd2940cb9
Merged-In: I32b611661918628c5b8d125ff738069cd2940cb9
(cherry picked from commit 01f8e8df138f42a14c23da4bea2107143876f267)
1 file changed