Merge "Remove CSV support"
am: 0faecf7b89

Change-Id: I02e8b74299afda2642567e3fcf9a41653cb7b888