Merge changes from topics "coreapi-flag", "coreapi-stubs-csv"
am: 900400cc60

Change-Id: I31b069c9c9601e751b3e99d769c99d73e13f7083