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

Change-Id: I510c011f5f3fc765ddda5c7a0e858e98ba341a46