Merge "Address comment in gerrit 17266"