Merge "Delete unused file" am: 37e5c04396
am: a028dfdfa4

Change-Id: Ie582f8ec1d67e87f3e9955587141ddaffe7baba3