Merge "Added a comment to make it clearer that the operation has to be the first Bug:2521447"