Merge "Updated delete icon" into pi-dev
am: 55642ef91b

Change-Id: I070f6c587c2b840793027e5e76fe4b258d76dd9d