Match subject with the verb

Change-Id: I42bfcc04ab8940a4c908e7cf365bdcca3fc08bcc
Merge "Match subject with the verb"