Merge "Update to r17 of LittleMock."