Merge "Merge "Adds doc to confusingly named method." into rvc-dev am: 7a5f4f4c8f am: 0063770c4b" into rvc-d1-dev-plus-aosp