Merge "Remove fake data" into nyc-mr2-dev
am: d258b2f40f  -s ours

Change-Id: Ic418e0cbdd54679f0af152b13f52f34d963da8b6