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

Change-Id: I25ff74ac3e46b60da05b9ab595f87d58bb50b6c0