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

Change-Id: I545e7ae5a03e9bca034e583751aa3a54f83ef14b