Merge changes from topics "coreapi-flag", "coreapi-stubs-csv" am: 4620039dc5
am: e5aa99f45c

Change-Id: I61130a7e58b117e1ea0ecafb915f519c6aca22c5