Merge "Use constant names instead of literals" into rvc-dev am: 5a06bb22e5 am: ce006e5908 am: d2c56f85f6
Change-Id: Ia7151f085d0ea5280d1efb3a548ed9e1a5bd10cf
This commit is contained in: