Verify change and commit messages in cherry-pick test Change-Id: I87d4954c523c02024d0895b946ef9489ccb3e84f