Merge "Removing bogus file added by mistake" am: a44c833042
am: 4180078d0d

Change-Id: I9da22da1fe2458162768ddf33f42eb9e8b7f974e