Merge "Use constant names instead of literals" into rvc-dev am: 5a06bb22e5 am: d547a0988c am: bdbbf19e42 am: 8041257d91
Change-Id: I9ab4943296c19d6e6f80db0d644bbb952bef0823
This commit is contained in: