Merge "Remove misleading comments" into rvc-dev am: c688e204 am: a148b4e3 am: d78af383 am: 4fed1d44 Change-Id: I185bbe7b089b4aa4f1e5b232503483d9edb7235b