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

Change-Id: I6348f6dfb9f7382087c052a4fedd7b84a73f92d4