Merge "Remove stale comment and add copyright notice" into rvc-dev am: 9c8ec232b1

Change-Id: I1ff9c845ce049b4834d3b8dd17044338bcbf48ed