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