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

Change-Id: I860b4e8953af55382c875a6c62951bb5c0da70e3