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

Change-Id: I74408491dfeb629b39afa874fb166856a1d85f6e