Merge "Fix constant type"
am: 01b7982a45

Change-Id: Ie4b0bb80c820e9483348ec75b932c6ef04ccfeeb