Merge "[Copy&Paste] remove unused copy&paste files Change-Id: Ibca67535f552abfe1479da...