Merge "Use constant names instead of literals" into rvc-dev am: 5a06bb22 am: d547a098 am: bdbbf19e Change-Id: I0d37c4a7032fbbc687d4f63bceb335df948f2519